api/member_views.py

@@ -31,9 +31,13 @@ def member(request):

                     rights = RightInfo.objects.filter(status=True).order_by('position')
              

                     rights = [right.data for right in rights]
              

                 
              

                -    goods = GoodsInfo.objects.filter(status=True).order_by('position')
              

                +    goods = GoodsInfo.objects.filter(only_for_member=False, status=True).order_by('position')
              

                     goods = [good.data(user_id) for good in goods][:2]
              

                 
              

                +    member_goods = GoodsInfo.objects.filter(only_for_member=True, minlevel__lte=user.level, status=True).order_by('position')
              

                +    member_goods = [good.data(user_id) for good in member_goods]
              

                +    member_goods = [good for good in member_goods if not good['has_member_exchange']]
              

                +
              

                     return response(200, data={
              

                         'nickname': user.final_nickname,
              

                         'avatar': user.avatar,
              
@@ -44,6 +48,7 @@ def member(request):

                         'level': user.level,
              

                         'rights': rights,
              

                         'goods': goods,
              

                +        'member_goods': member_goods,
              

                     })
              

                 
              

                 
              
@@ -101,7 +106,7 @@ def goods(request):

                     except UserInfo.DoesNotExist:
              

                         return response(UserStatusCode.USER_NOT_FOUND)
              

                 
              

                -    raw_goods = GoodsInfo.objects.filter(status=True).order_by('position')
              

                +    raw_goods = GoodsInfo.objects.filter(only_for_member=False, status=True).order_by('position')
              

                     banners = goods = []
              

                     for good in raw_goods:
              

                         if good.is_slider: